From 293ed565ee6f5f408a8418893c1c4665b53fce95 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 17 Jun 2008 19:29:22 +0000 Subject: [PATCH] Need to do the GTK_DISABLE_DEPRECATED #undef/#define dance here, too, 2008-06-17 Tor Lillqvist * gtk/gtknotebook.c: Need to do the GTK_DISABLE_DEPRECATED #undef/#define dance here, too, because gtk_notebook_set_group_id() is deprecated but used here before it is defined, and gcc complains about conflicting type from the implicit int declaration when it sees the actual void definition. svn path=/trunk/; revision=20435 --- ChangeLog | 6 ++++++ gtk/gtknotebook.c | 11 +++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6cd3a97204..634aef7c39 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2008-06-17 Tor Lillqvist + * gtk/gtknotebook.c: Need to do the GTK_DISABLE_DEPRECATED + #undef/#define dance here, too, because + gtk_notebook_set_group_id() is deprecated but used here before it + is defined, and gcc complains about conflicting type from the + implicit int declaration when it sees the actual void definition. + * modules/input/gtkimcontextime.h: Don't use the deprecated GTK_* GtkType macros. diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index 9a1c26eb92..1ad9439657 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -26,20 +26,27 @@ */ #include + +#include #include + +#include + +#undef GTK_DISABLE_DEPRECATED + #include "gtknotebook.h" #include "gtkmain.h" #include "gtkmenu.h" #include "gtkmenuitem.h" #include "gtklabel.h" -#include -#include #include "gtkintl.h" #include "gtkmarshalers.h" #include "gtkbindings.h" #include "gtkprivate.h" #include "gtkdnd.h" #include "gtkbuildable.h" + +#define GTK_DISABLE_DEPRECATED #include "gtkalias.h" #define SCROLL_DELAY_FACTOR 5 -- 2.30.2